bitkeeper revision 1.1347 (4266ee31uFDz7ZMst_Cy-vYbXJ2EZw)

__vmxon() is called twice for the boot cpu, because identify_cpu() is called
twice. This patch ensures that identify_cpu() and hence __vmxon() is called
exactly once for the boot CPU on SMP.

Signed-off-by: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
Signed-off-by: Arun Sharma <arun.sharma@intel.com>
Signed-off-by: ian@xensource.com

diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c
index 8769da839fdfbb9370795ab3c0ad0ed90cb0e895..4b71243a412a4a316b52ddcf1e0fc30776741984 100644 (file)
--- a/xen/arch/x86/smpboot.c
+++ b/xen/arch/x86/smpboot.c
@@ -115,7 +115,8 @@ void __init smp_alloc_memory(void)
 void __init smp_store_cpu_info(int id)
 {
     cpu_data[id] = boot_cpu_data;
-    identify_cpu(&cpu_data[id]);
+    if (id != 0)
+        identify_cpu(&cpu_data[id]);
 }
 
 /*